Revert 16560:822d4ec5cfb1.

Preference seems to be to update library versions only when the ABI
changes. Only libxenctrl/libxenguest have their version number changed
to 3.2.0, as a reminder that they change on pretty much every major
release.

libfsimage/libxenstore/libblktap have not changed substantially
recently, hence the ABI has not changed, and version number stays the
same as in Xen 3.1 (and before).

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/Config.mk b/Config.mk
index c839e951c92b63420dff530b4a07321e96fc51fb..01644b167c6e612602db69884cda2843021e296e 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -13,9 +13,6 @@ ifeq ($(XEN_TARGET_ARCH),x86_32)
 XEN_TARGET_X86_PAE  ?= y
 endif
 
-LIBRARIES_VERSION_MAJOR = 3.2
-LIBRARIES_VERSION_MINOR = 0
-
 CONFIG_$(XEN_OS) := y
 
 SHELL     ?= /bin/sh

diff --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile
index ce7e7f610b20aaac74758d83d20970558f2eedaa..f5621e1e2391f577311120b90794b64ec7d4761c 100644 (file)
--- a/tools/blktap/lib/Makefile
+++ b/tools/blktap/lib/Makefile
@@ -1,8 +1,8 @@
 XEN_ROOT = ../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-MAJOR = $(LIBRARIES_VERSION_MAJOR)
-MINOR = $(LIBRARIES_VERSION_MINOR)
+MAJOR    = 3.0
+MINOR    = 0
 SONAME   = libblktap.so.$(MAJOR)
 
 BLKTAP_INSTALL_DIR = /usr/sbin

diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile
index 674b5cf93a46eb5edd62b6cb39d4cab88f400258..6efce44f02f5fe475b6698cbbe1dae81ab529eca 100644 (file)
--- a/tools/libfsimage/common/Makefile
+++ b/tools/libfsimage/common/Makefile
@@ -1,8 +1,8 @@
 XEN_ROOT = ../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-MAJOR = $(LIBRARIES_VERSION_MAJOR)
-MINOR = $(LIBRARIES_VERSION_MINOR)
+MAJOR = 1.0
+MINOR = 0
 
 CFLAGS += -Werror -Wp,-MD,.$(@F).d
 DEPS = .*.d

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 7fbd83b1fd7d3b76cd67818fb9ee88fcdaa45d46..3c9899d152b2b90e72670a2f4c2060eaebbf92f3 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -1,8 +1,8 @@
 XEN_ROOT = ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-MAJOR = $(LIBRARIES_VERSION_MAJOR)
-MINOR = $(LIBRARIES_VERSION_MINOR)
+MAJOR    = 3.2
+MINOR    = 0
 
 CTRL_SRCS-y       :=
 CTRL_SRCS-y       += xc_core.c

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index ff165bd5d13d47a9cb6e50363cc83dc6ecfb9502..adbe6056752d77de06158d24da84f891cdfc10ed 100644 (file)
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -2,8 +2,8 @@ XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Rules.mk
 XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
 
-MAJOR = $(LIBRARIES_VERSION_MAJOR)
-MINOR = $(LIBRARIES_VERSION_MINOR)
+MAJOR = 3.0
+MINOR = 0
 
 PROFILE=#-pg
 BASECFLAGS=-Werror